fix default value for ::digits property, leave as 1 as per havoc's

Tue Jan 29 11:51:14 2002  Tim Janik  <timj@gtk.org>

        * gtk/gtkscale.[hc]: fix default value for ::digits property,
        leave as 1 as per havoc's request.
        don't apply the draw_digits value to range->round_digits,
        so we don't perform gross quantization by default.

diff --git a/ChangeLog b/ChangeLog
index 267ca71ff6d3d09ab59c0c18f1d80e4d2fe652bb..b834eae76f8d15600e0a88ce8155ef07654a8870 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jan 29 11:51:14 2002  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkscale.[hc]: fix default value for ::digits property,
+       leave as 1 as per havoc's request.
+       don't apply the draw_digits value to range->round_digits,
+       so we don't perform gross quantization by default.
+
 2002-01-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextbtree.c (_gtk_text_btree_delete): fix assertion

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 267ca71ff6d3d09ab59c0c18f1d80e4d2fe652bb..b834eae76f8d15600e0a88ce8155ef07654a8870 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Tue Jan 29 11:51:14 2002  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkscale.[hc]: fix default value for ::digits property,
+       leave as 1 as per havoc's request.
+       don't apply the draw_digits value to range->round_digits,
+       so we don't perform gross quantization by default.
+
 2002-01-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextbtree.c (_gtk_text_btree_delete): fix assertion

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 267ca71ff6d3d09ab59c0c18f1d80e4d2fe652bb..b834eae76f8d15600e0a88ce8155ef07654a8870 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue Jan 29 11:51:14 2002  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkscale.[hc]: fix default value for ::digits property,
+       leave as 1 as per havoc's request.
+       don't apply the draw_digits value to range->round_digits,
+       so we don't perform gross quantization by default.
+
 2002-01-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextbtree.c (_gtk_text_btree_delete): fix assertion

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 267ca71ff6d3d09ab59c0c18f1d80e4d2fe652bb..b834eae76f8d15600e0a88ce8155ef07654a8870 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Tue Jan 29 11:51:14 2002  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkscale.[hc]: fix default value for ::digits property,
+       leave as 1 as per havoc's request.
+       don't apply the draw_digits value to range->round_digits,
+       so we don't perform gross quantization by default.
+
 2002-01-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextbtree.c (_gtk_text_btree_delete): fix assertion

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 267ca71ff6d3d09ab59c0c18f1d80e4d2fe652bb..b834eae76f8d15600e0a88ce8155ef07654a8870 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Tue Jan 29 11:51:14 2002  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkscale.[hc]: fix default value for ::digits property,
+       leave as 1 as per havoc's request.
+       don't apply the draw_digits value to range->round_digits,
+       so we don't perform gross quantization by default.
+
 2002-01-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextbtree.c (_gtk_text_btree_delete): fix assertion

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 267ca71ff6d3d09ab59c0c18f1d80e4d2fe652bb..b834eae76f8d15600e0a88ce8155ef07654a8870 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Tue Jan 29 11:51:14 2002  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkscale.[hc]: fix default value for ::digits property,
+       leave as 1 as per havoc's request.
+       don't apply the draw_digits value to range->round_digits,
+       so we don't perform gross quantization by default.
+
 2002-01-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextbtree.c (_gtk_text_btree_delete): fix assertion

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 267ca71ff6d3d09ab59c0c18f1d80e4d2fe652bb..b834eae76f8d15600e0a88ce8155ef07654a8870 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Tue Jan 29 11:51:14 2002  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkscale.[hc]: fix default value for ::digits property,
+       leave as 1 as per havoc's request.
+       don't apply the draw_digits value to range->round_digits,
+       so we don't perform gross quantization by default.
+
 2002-01-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextbtree.c (_gtk_text_btree_delete): fix assertion

diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index c03aa14105e62a791a6b4ed7a80d16e4af7539f1..d971a80d9ec82c1df086137909cfb82726d3d21b 100644 (file)
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -32,6 +32,13 @@
 #include "gdk/gdkkeysyms.h"
 #include "gtkbindings.h"
 
+
+#define        MAX_DIGITS      (64)    /* don't change this,
+                                * a) you don't need to and
+                                * b) you might cause buffer owerflows in
+                                *    unrelated code portions otherwise
+                                */
+
 enum {
   PROP_0,
   PROP_DIGITS,
@@ -147,9 +154,9 @@ gtk_scale_class_init (GtkScaleClass *class)
                                    g_param_spec_int ("digits",
                                                     _("Digits"),
                                                     _("The number of decimal places that are displayed in the value"),
-                                                    0,
-                                                    G_MAXINT,
-                                                    0,
+                                                    -1,
+                                                    MAX_DIGITS,
+                                                    1,
                                                     G_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
@@ -346,7 +353,7 @@ gtk_scale_get_property (GObject      *object,
   switch (prop_id)
     {
     case PROP_DIGITS:
-      g_value_set_int (value, scale->digits);
+      g_value_set_int (value, scale->draw_digits);
       break;
     case PROP_DRAW_VALUE:
       g_value_set_boolean (value, scale->draw_value);
@@ -374,11 +381,10 @@ gtk_scale_init (GtkScale *scale)
   range->has_stepper_b = FALSE;
   range->has_stepper_c = FALSE;
   range->has_stepper_d = FALSE;
-  
+
+  scale->draw_digits = 1;
   scale->draw_value = TRUE;
   scale->value_pos = GTK_POS_TOP;
-  scale->digits = 1;
-  range->round_digits = scale->digits;
 }
 
 void
@@ -391,12 +397,11 @@ gtk_scale_set_digits (GtkScale *scale,
 
   range = GTK_RANGE (scale);
   
-  digits = CLAMP (digits, -1, 16);
+  digits = CLAMP (digits, -1, MAX_DIGITS);
 
-  if (scale->digits != digits)
+  if (scale->draw_digits != digits)
     {
-      scale->digits = digits;
-      range->round_digits = digits;
+      scale->draw_digits = digits;
       
       gtk_widget_queue_resize (GTK_WIDGET (scale));
 
@@ -409,7 +414,7 @@ gtk_scale_get_digits (GtkScale *scale)
 {
   g_return_val_if_fail (GTK_IS_SCALE (scale), -1);
 
-  return scale->digits;
+  return scale->draw_digits;
 }
 
 void
@@ -602,6 +607,6 @@ _gtk_scale_format_value (GtkScale *scale,
   if (fmt)
     return fmt;
   else
-    return g_strdup_printf ("%0.*f", scale->digits,
+    return g_strdup_printf ("%0.*f", scale->draw_digits,
                             value);
 }

diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index 7bfca7d77e87ae41a607398579d9aaa6e8bfef19..ecc028c60b93de385fc0685a744c9308c6f5d341 100644 (file)
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.h
@@ -52,7 +52,7 @@ struct _GtkScale
 {
   GtkRange range;
 
-  gint digits;
+  gint  draw_digits;
   guint draw_value : 1;
   guint value_pos : 2;
 };